Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature/SPRIND-116 #315

Merged
merged 26 commits into from
Jan 16, 2025
Merged

feature/SPRIND-116 #315

merged 26 commits into from
Jan 16, 2025

Conversation

zoemaas
Copy link
Contributor

@zoemaas zoemaas commented Nov 20, 2024

No description provided.

@zoemaas zoemaas self-assigned this Nov 26, 2024
@zoemaas zoemaas marked this pull request as ready for review November 26, 2024 16:04
package.json Outdated Show resolved Hide resolved
Zoe Maas added 4 commits January 14, 2025 16:47
…-wallet into feature/SPRIND-116

# Conflicts:
#	package.json
#	src/machines/siopV2Machine.tsx
#	src/services/machines/siopV2MachineService.ts
#	yarn.lock
@zoemaas zoemaas merged commit 19a8fe9 into funke Jan 16, 2025
@zoemaas zoemaas deleted the feature/SPRIND-116 branch January 16, 2025 12:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants